x86: Disable MSI IRQs until locking is fixed.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index c2c17b719e895f09c5198365d1001c5bac9f72f1..efb73ad011c4130250a388d1a62263567ccac7f1 100644 (file)
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -793,6 +793,10 @@ int map_domain_pirq(
 
     ASSERT(spin_is_locked(&d->event_lock));
 
+    /* XXX Until pcidev and msi locking is fixed. */
+    if ( type == MAP_PIRQ_TYPE_MSI )
+        return -EINVAL;
+
     if ( !IS_PRIV(current->domain) )
         return -EPERM;
 
@@ -840,7 +844,7 @@ int map_domain_pirq(
     d->arch.pirq_vector[pirq] = vector;
     d->arch.vector_pirq[vector] = pirq;
 
-done:
+ done:
     spin_unlock_irqrestore(&desc->lock, flags);
     return ret;
 }